projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 80e0491) | patch
Properly fix building with HarfBuzz and without libotf
authorKhaled Hosny <khaledhosny@eglug.org>
Sat, 22 Dec 2018 08:13:06 +0000 (10:13 +0200)
committerKhaled Hosny <khaledhosny@eglug.org>
Sat, 22 Dec 2018 08:22:22 +0000 (10:22 +0200)
commit47ed564056a657eb602559576d59cd66734e7234
tree1f1fb78e0f23c53da91d48c27d2ff653d895f77ftree | snapshot
parent80e0491420a9f645efa6c1438f209f70610c4065commit | diff
Properly fix building with HarfBuzz and without libotf

HarfBuzz support does not depend on libotf, the build breakage when
libotf is missing was because code guarded with:

 #if defined HAVE_M17N_FLT && defined HAVE_LIBOTF

was incorrectly changed to:

 #if defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ

this is now properly fixed by making it:

 #if (defined HAVE_M17N_FLT && defined HAVE_LIBOTF) || defined HAVE_HARFBUZZ

Other changes in previous commits were reverted.
src/ftcrfont.c diff | blob | history
src/ftfont.c diff | blob | history
src/ftxfont.c diff | blob | history
src/xftfont.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.